X11: Fix crash in gdk_x11_gl_context_texture_from_surface
authorAlexander Larsson <alexl@redhat.com>
Thu, 16 Oct 2014 10:58:43 +0000 (12:58 +0200)
committerAlexander Larsson <alexl@redhat.com>
Thu, 16 Oct 2014 11:00:45 +0000 (13:00 +0200)
We need to look at the impl_window for the gl rendering, not
the subwindow we're rendering into.

gdk/x11/gdkglcontext-x11.c

index 1464d9aa95f9afb8e0844aefa7a493e9cc6ddfed..3377f6966e04538f1e3eea8aa9cf02fd78955f20 100644 (file)
@@ -368,7 +368,7 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *context,
   if (glx_pixmap == NULL)
     return FALSE;
 
-  window = gdk_gl_context_get_window (gdk_gl_context_get_current ());
+  window = gdk_gl_context_get_window (gdk_gl_context_get_current ())->impl_window;
   window_scale = gdk_window_get_scale_factor (window);
   window_height = gdk_window_get_height (window);